Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 28 Feb 2010 13:26:25 +0000 (13:26 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 28 Feb 2010 13:26:25 +0000 (13:26 +0000)

Trivial merge